159. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:59 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

159.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/Category	Description.php	2015-10-01 13:14:26 +0000
2	/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/Category	Description.php	2015-10-01 13:14:26 +0000

159.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	1	30
Changed	0	0
Inserted	0	0
Removed	0	0

159.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

159.4 Active regular expressions

No regular expressions were active.

159.5 Comparison detail

1	<?php	1	<?php
2	namespace Smartwave\Porto\Model\Config\Settings\Category;	2	namespace Smartwave\Porto\Model\Config\Settings\Category;
3		3
4	class Description implements \Magento\Framework\Option\ArrayInterface	4	class Description implements \Magento\Framework\Option\ArrayInterface
5	{	5	{
6	public function toOptionArray()	6	public function toOptionArray()
7	{	7	{
8	return [['value' => '', 'label' => __('Default')], ['value' => 'full_width', 'label' => __('As Full Width below the Header')], ['value' => 'main_column', 'label' => __('Main Column above the Toolbar')]];	8	return [['value' => '', 'label' => __('Default')], ['value' => 'full_width', 'label' => __('As Full Width below the Header')], ['value' => 'main_column', 'label' => __('Main Column above the Toolbar')]];
9	}	9	}
10		10
11	public function toArray()	11	public function toArray()
12	{	12	{
13	return ['' => __('Default'), 'full_width' => __('As Full Width below the Header'), 'main_column' => __('Main Column above the Toolbar')];	13	return ['' => __('Default'), 'full_width' => __('As Full Width below the Header'), 'main_column' => __('Main Column above the Toolbar')];
14	}	14	}
15	}	15	}